[IA64] makes some includes explicit

Make some includes explicit.
Do not compile anymore vmx/mm.c: not used.

Signed-off-by: Tristan Gingold <tristan.gingold@bull.net>

diff --git a/xen/arch/ia64/linux-xen/iosapic.c b/xen/arch/ia64/linux-xen/iosapic.c
index 29a20c58df824e94c288a3ca4f1c809cecfd0427..90d9ba38f49dd2e10aba334e953dd153ba920531 100644 (file)
--- a/xen/arch/ia64/linux-xen/iosapic.c
+++ b/xen/arch/ia64/linux-xen/iosapic.c
@@ -77,6 +77,8 @@
 #include <linux/list.h>
 #ifndef XEN
 #include <linux/pci.h>
+#else
+#include <xen/errno.h>
 #endif
 #include <linux/smp.h>
 #include <linux/smp_lock.h>

diff --git a/xen/arch/ia64/linux-xen/irq_ia64.c b/xen/arch/ia64/linux-xen/irq_ia64.c
index dccecdf250899f0c42311ff7cb8ac2484a471e2d..b7b82c24e8454130f47b422f7a85dfc9830ee2b6 100644 (file)
--- a/xen/arch/ia64/linux-xen/irq_ia64.c
+++ b/xen/arch/ia64/linux-xen/irq_ia64.c
@@ -40,6 +40,10 @@
 #include <asm/pgtable.h>
 #include <asm/system.h>
 
+#ifdef XEN
+#include <xen/perfc.h>
+#endif
+
 #ifdef CONFIG_PERFMON
 # include <asm/perfmon.h>
 #endif

diff --git a/xen/arch/ia64/linux-xen/mca.c b/xen/arch/ia64/linux-xen/mca.c
index 6d377309422083db5ea775e73109d7dc11d5eadd..1e4a86061b02786c3e3f48c9ab841f965b72872e 100644 (file)
--- a/xen/arch/ia64/linux-xen/mca.c
+++ b/xen/arch/ia64/linux-xen/mca.c
@@ -79,6 +79,7 @@
 
 #ifdef XEN
 #include <xen/symbols.h>
+#include <xen/mm.h>
 #endif
 
 #if defined(IA64_MCA_DEBUG_INFO)

diff --git a/xen/arch/ia64/linux-xen/process-linux-xen.c b/xen/arch/ia64/linux-xen/process-linux-xen.c
index 228280f2b8a8846ab74e74ce55dee4bee054d680..aaaaaca0fe3e80a9802fc1a3f00cdad863e48bd1 100644 (file)
--- a/xen/arch/ia64/linux-xen/process-linux-xen.c
+++ b/xen/arch/ia64/linux-xen/process-linux-xen.c
@@ -10,6 +10,7 @@
 #include <xen/lib.h>
 #include <xen/symbols.h>
 #include <xen/smp.h>
+#include <xen/sched.h>
 #include <asm/uaccess.h>
 #include <asm/processor.h>
 #include <asm/ptrace.h>
@@ -166,6 +167,7 @@ show_regs (struct pt_regs *regs)
        printk("r26 : %016lx r27 : %016lx r28 : %016lx\n", regs->r26, regs->r27, regs->r28);
        printk("r29 : %016lx r30 : %016lx r31 : %016lx\n", regs->r29, regs->r30, regs->r31);
 
+#ifndef XEN
        if (user_mode(regs)) {
                /* print the stacked registers */
                unsigned long val, *bsp, ndirty;
@@ -180,6 +182,7 @@ show_regs (struct pt_regs *regs)
                               ((i == sof - 1) || (i % 3) == 2) ? "\n" : " ");
                }
        } else
+#endif
                show_stack(NULL, NULL);
 }
 

diff --git a/xen/arch/ia64/linux-xen/smp.c b/xen/arch/ia64/linux-xen/smp.c
index 67b80710f7c1b81b42ed6ddb950f27083d6be1b4..2f4ed8b6a92b8790120d56955ee861426800e61c 100644 (file)
--- a/xen/arch/ia64/linux-xen/smp.c
+++ b/xen/arch/ia64/linux-xen/smp.c
@@ -48,6 +48,7 @@
 #include <asm/unistd.h>
 #include <asm/mca.h>
 #ifdef XEN
+#include <xen/errno.h>
 #include <asm/vhpt.h>
 #include <asm/hw_irq.h>
 #endif

diff --git a/xen/arch/ia64/linux-xen/unwind.c b/xen/arch/ia64/linux-xen/unwind.c
index 168948ecc0f3766dbbec989a29adb5d964cb24d6..2933a5b02fbd03ff66e65a4c3a5affb7b907587a 100644 (file)
--- a/xen/arch/ia64/linux-xen/unwind.c
+++ b/xen/arch/ia64/linux-xen/unwind.c
@@ -33,6 +33,7 @@
 #include <xen/sched.h>
 #include <xen/xmalloc.h>
 #include <xen/spinlock.h>
+#include <xen/errno.h>
 
 // work around
 #ifdef CONFIG_SMP
@@ -2315,6 +2316,7 @@ unw_init (void)
                          __start_unwind, __end_unwind);
 }
 
+#ifndef XEN
 /*
  * DEPRECATED DEPRECATED DEPRECATED DEPRECATED DEPRECATED DEPRECATED DEPRECATED
  *
@@ -2353,3 +2355,4 @@ sys_getunwind (void __user *buf, size_t buf_size)
                        return -EFAULT;
        return unw.gate_table_size;
 }
+#endif

diff --git a/xen/arch/ia64/vmx/Makefile b/xen/arch/ia64/vmx/Makefile
index 0db1f84a4ba921b423353e97ae50f19c12322a71..9e90d955c989a9f4189974f8fd4eaea63f85a353 100644 (file)
--- a/xen/arch/ia64/vmx/Makefile
+++ b/xen/arch/ia64/vmx/Makefile
@@ -1,5 +1,5 @@
 obj-y += hvm_vioapic.o
-obj-y += mm.o
+#obj-y += mm.o
 obj-y += mmio.o
 obj-y += pal_emul.o
 obj-y += vlsapic.o

diff --git a/xen/arch/ia64/vmx/mmio.c b/xen/arch/ia64/vmx/mmio.c
index c1de4a786ff994175243cb830689ae6bd12fe433..5501acb74d559d31ebff015d234dab4bdd9cb52b 100644 (file)
--- a/xen/arch/ia64/vmx/mmio.c
+++ b/xen/arch/ia64/vmx/mmio.c
@@ -22,6 +22,7 @@
  */
 
 #include <linux/sched.h>
+#include <xen/mm.h>
 #include <asm/tlb.h>
 #include <asm/vmx_mm_def.h>
 #include <asm/gcc_intrin.h>
@@ -30,7 +31,6 @@
 #include <asm/bundle.h>
 #include <asm/types.h>
 #include <public/hvm/ioreq.h>
-#include <asm/mm.h>
 #include <asm/vmx.h>
 #include <public/event_channel.h>
 #include <public/arch-ia64.h>

diff --git a/xen/arch/ia64/vmx/vmmu.c b/xen/arch/ia64/vmx/vmmu.c
index 4bff1727ea27b401c02c961eaf305adb466f595a..9412810f3dbba5226bb0278a600138b8f1def77a 100644 (file)
--- a/xen/arch/ia64/vmx/vmmu.c
+++ b/xen/arch/ia64/vmx/vmmu.c
@@ -33,6 +33,7 @@
 #include <asm/kregs.h>
 #include <asm/vcpu.h>
 #include <xen/irq.h>
+#include <xen/errno.h>
 
 /*
  * Get the machine page frame number in 16KB unit

diff --git a/xen/arch/ia64/vmx/vtlb.c b/xen/arch/ia64/vmx/vtlb.c
index 8d2da7f308d54ecc2597d1eefc0dce8e17948147..bc6fe21d8fa4dc80b833fbef76b613c616e768ad 100644 (file)
--- a/xen/arch/ia64/vmx/vtlb.c
+++ b/xen/arch/ia64/vmx/vtlb.c
@@ -23,7 +23,7 @@
 
 #include <linux/sched.h>
 #include <asm/tlb.h>
-#include <asm/mm.h>
+#include <xen/mm.h>
 #include <asm/vmx_mm_def.h>
 #include <asm/gcc_intrin.h>
 #include <linux/interrupt.h>

diff --git a/xen/arch/ia64/xen/acpi.c b/xen/arch/ia64/xen/acpi.c
index 7635cb053d2a21edf9c7409e7bd34c64291709bb..af1748f1cb58673753a0db92eb83df8f6809535d 100644 (file)
--- a/xen/arch/ia64/xen/acpi.c
+++ b/xen/arch/ia64/xen/acpi.c
@@ -51,6 +51,9 @@
 #include <asm/numa.h>
 #include <asm/sal.h>
 #include <asm/hw_irq.h>
+#ifdef XEN
+#include <xen/errno.h>
+#endif
 
 #define BAD_MADT_ENTRY(entry, end) (                                        \
                (!entry) || (unsigned long)entry + sizeof(*entry) > end ||  \

diff --git a/xen/arch/ia64/xen/dom0_ops.c b/xen/arch/ia64/xen/dom0_ops.c
index e08da03964b9a9e288a39a1ad423c5a416e7a317..f8d2757c2cd050c2547d17a4066b987fdf720b04 100644 (file)
--- a/xen/arch/ia64/xen/dom0_ops.c
+++ b/xen/arch/ia64/xen/dom0_ops.c
@@ -21,6 +21,7 @@
 #include <asm/vmx.h>
 #include <asm/dom_fw.h>
 #include <xen/iocap.h>
+#include <xen/errno.h>
 
 void build_physmap_table(struct domain *d);
 

diff --git a/xen/arch/ia64/xen/dom_fw.c b/xen/arch/ia64/xen/dom_fw.c
index 5eb6643959fe345c954079f4f57731dfff8769a9..2a70b66e662fdc6ad7824b37c98c8ff481851354 100644 (file)
--- a/xen/arch/ia64/xen/dom_fw.c
+++ b/xen/arch/ia64/xen/dom_fw.c
@@ -21,6 +21,7 @@
 #include <asm/fpswa.h>
 #include <xen/version.h>
 #include <xen/acpi.h>
+#include <xen/errno.h>
 
 #include <asm/dom_fw.h>
 #include <asm/bundle.h>

diff --git a/xen/arch/ia64/xen/faults.c b/xen/arch/ia64/xen/faults.c
index 171fddd0410ac569dd56ce003090274ddfe1fb72..f2e3a1bef7bfa52964535da9035467a82404dc4b 100644 (file)
--- a/xen/arch/ia64/xen/faults.c
+++ b/xen/arch/ia64/xen/faults.c
@@ -13,6 +13,8 @@
 #include <xen/smp.h>
 #include <asm/ptrace.h>
 #include <xen/delay.h>
+#include <xen/perfc.h>
+#include <xen/mm.h>
 
 #include <asm/system.h>
 #include <asm/processor.h>
@@ -28,6 +30,7 @@
 #include <asm/bundle.h>
 #include <asm/asm-xsi-offsets.h>
 #include <asm/shadow.h>
+#include <asm/uaccess.h>
 
 extern void die_if_kernel(char *str, struct pt_regs *regs, long err);
 /* FIXME: where these declarations shold be there ? */

diff --git a/xen/arch/ia64/xen/fw_emul.c b/xen/arch/ia64/xen/fw_emul.c
index be96f92a6f1c18180738871a88dd62357e195fca..5b8c91cabf9b37c3cc108614becdb07b9a48efa8 100644 (file)
--- a/xen/arch/ia64/xen/fw_emul.c
+++ b/xen/arch/ia64/xen/fw_emul.c
@@ -28,6 +28,7 @@
 #include "hpsim_ssc.h"
 #include <asm/vcpu.h>
 #include <asm/dom_fw.h>
+#include <asm/uaccess.h>
 
 extern unsigned long running_on_sim;
 

diff --git a/xen/arch/ia64/xen/hypercall.c b/xen/arch/ia64/xen/hypercall.c
index 6d4927e84933b0cecbcb5227efcf603ae9a69b97..b5321e030c53d4111161f43b6492b7056ef8490f 100644 (file)
--- a/xen/arch/ia64/xen/hypercall.c
+++ b/xen/arch/ia64/xen/hypercall.c
@@ -11,6 +11,7 @@
 #include <xen/hypercall.h>
 #include <xen/multicall.h>
 #include <xen/guest_access.h>
+#include <xen/mm.h>
 
 #include <linux/efi.h> /* FOR EFI_UNIMPLEMENTED */
 #include <asm/sal.h>   /* FOR struct ia64_sal_retval */

diff --git a/xen/arch/ia64/xen/irq.c b/xen/arch/ia64/xen/irq.c
index 7dd075cd1dec7bfd9df6b77e7c1e29aeb0f1febd..98f11cad11d2ac874e988666b6e14225d00ff49e 100644 (file)
--- a/xen/arch/ia64/xen/irq.c
+++ b/xen/arch/ia64/xen/irq.c
@@ -40,7 +40,6 @@
 #include <asm/smp.h>
 #include <asm/system.h>
 #include <asm/bitops.h>
-#include <asm/uaccess.h>
 #include <asm/pgalloc.h>
 #include <asm/delay.h>
 #include <xen/irq.h>

diff --git a/xen/arch/ia64/xen/mm.c b/xen/arch/ia64/xen/mm.c
index 35e299c95101cda2ffce9494a4e7306ccd4b718b..eab9391bb59922fef955de55ee98f567f24eabd0 100644 (file)
--- a/xen/arch/ia64/xen/mm.c
+++ b/xen/arch/ia64/xen/mm.c
@@ -166,7 +166,8 @@
 #include <xen/sched.h>
 #include <xen/domain.h>
 #include <asm/xentypes.h>
-#include <asm/mm.h>
+#include <xen/mm.h>
+#include <xen/errno.h>
 #include <asm/pgalloc.h>
 #include <asm/vhpt.h>
 #include <asm/vcpu.h>

diff --git a/xen/arch/ia64/xen/pcdp.c b/xen/arch/ia64/xen/pcdp.c
index 6c97d87f3cf00d1a689c9b5460b5b3197754ad21..4f968cd33011a4cd3e1feacd5351526385a7eedf 100644 (file)
--- a/xen/arch/ia64/xen/pcdp.c
+++ b/xen/arch/ia64/xen/pcdp.c
@@ -18,6 +18,7 @@
 #ifdef XEN
 #include <linux/efi.h>
 #include <linux/errno.h>
+#include <asm/io.h>
 #include <asm/iosapic.h>
 #include <asm/system.h>
 #include <acpi/acpi.h>

diff --git a/xen/arch/ia64/xen/privop.c b/xen/arch/ia64/xen/privop.c
index a66e2153219b519b0abd36669d1f3abda6784b32..31e1ebc19808d66e9fc76331b84ad0a191ea737e 100644 (file)
--- a/xen/arch/ia64/xen/privop.c
+++ b/xen/arch/ia64/xen/privop.c
@@ -13,6 +13,7 @@
 #include <asm/dom_fw.h>
 #include <asm/vhpt.h>
 #include <asm/bundle.h>
+#include <xen/perfc.h>
 
 long priv_verbose=0;
 unsigned long privop_trace = 0;

diff --git a/xen/arch/ia64/xen/vcpu.c b/xen/arch/ia64/xen/vcpu.c
index 39f9b1d8ed13f053c9203edbb05e3a7586aded8e..7ab3197393549ff3cce43bcb925e399c94cc851c 100644 (file)
--- a/xen/arch/ia64/xen/vcpu.c
+++ b/xen/arch/ia64/xen/vcpu.c
@@ -8,6 +8,7 @@
 
 #include <linux/sched.h>
 #include <public/arch-ia64.h>
+#include <xen/mm.h>
 #include <asm/ia64_int.h>
 #include <asm/vcpu.h>
 #include <asm/regionreg.h>
@@ -22,6 +23,7 @@
 #include <asm/vmx_phy_mode.h>
 #include <asm/bundle.h>
 #include <asm/privop_stat.h>
+#include <asm/uaccess.h>
 
 /* FIXME: where these declarations should be there ? */
 extern void getreg(unsigned long regnum, unsigned long *val, int *nat, struct pt_regs *regs);

diff --git a/xen/include/asm-ia64/multicall.h b/xen/include/asm-ia64/multicall.h
index ea104e5efa0915933c48396fbef8fcb464a22ac6..15b825bbf03645e20be9aec86de5efaeb4fd48b7 100644 (file)
--- a/xen/include/asm-ia64/multicall.h
+++ b/xen/include/asm-ia64/multicall.h
@@ -2,6 +2,7 @@
 #define __ASM_IA64_MULTICALL_H__
 
 #include <public/xen.h>
+#include <xen/errno.h>
 
 typedef unsigned long (*hypercall_t)(
                        unsigned long arg0,